menuitem: don't use content allocation to resize the GdkWindow
authorCosimo Cecchi <cosimoc@gnome.org>
Tue, 22 Dec 2015 23:36:00 +0000 (15:36 -0800)
committerCosimo Cecchi <cosimoc@gnome.org>
Tue, 22 Dec 2015 23:36:00 +0000 (15:36 -0800)
This is a fallout from the gadget conversion.

gtk/gtkmenuitem.c

index a23c25d4a46d5ec321d7938472b03676b752a591..10c2cbd3ae8f10e998f702ef5dc51d9491f3d315 100644 (file)
@@ -406,11 +406,6 @@ gtk_menu_item_allocate (GtkCssGadget        *gadget,
       gdk_rectangle_union (out_clip, &arrow_clip, out_clip);
     }
 
-  if (gtk_widget_get_realized (widget))
-    gdk_window_move_resize (priv->event_window,
-                            allocation->x, allocation->y,
-                            allocation->width, allocation->height);
-
   if (priv->submenu)
     gtk_menu_reposition (GTK_MENU (priv->submenu));
 }
@@ -425,6 +420,11 @@ gtk_menu_item_size_allocate (GtkWidget     *widget,
   
   gtk_widget_set_allocation (widget, allocation);
 
+  if (gtk_widget_get_realized (widget))
+    gdk_window_move_resize (priv->event_window,
+                            allocation->x, allocation->y,
+                            allocation->width, allocation->height);
+
   gtk_css_gadget_allocate (priv->gadget,
                            allocation,
                            gtk_widget_get_allocated_baseline (widget),